🌎 rns.kin.earth git 🌍
Commit e4dfd052e66b4af30984d960969b991d405b895d
Parents : 73a3516
Author : Mark Qvist <mark@adepta.io>
Date : 2020-08-12T21:49:59+02:00
Implemented recursive resource segmentation for large transfers
Changes
2 files changed, 26 insertions(+), 19 deletions(-)
Diff
diff --git a/Examples/Filetransfer.py b/Examples/Filetransfer.py
index 655730b6..9304b0dd 100644
--- a/Examples/Filetransfer.py
+++ b/Examples/Filetransfer.py
@@ -251,8 +251,10 @@ def client(destination_hexhash, configpath):
# Requests the specified file from the server
def download(filename):
- global server_link, menu_mode, current_filename
+ global server_link, menu_mode, current_filename, transfer_size, download_started
current_filename = filename
+ download_started = 0
+ transfer_size = 0
# We just create a packet containing the
# requested filename, and send it down the
@@ -454,14 +456,16 @@ def link_closed(link):
# so the user can be shown a progress of
# the download.
def download_began(resource):
- global menu_mode, current_download, download_started, transfer_size, file_size
- current_download = resource
-
- download_started = time.time()
- transfer_size = resource.size
- file_size = resource.uncompressed_size
-
- menu_mode = "downloading"
+ global menu_mode, current_download, download_started, transfer_size, file_size
+ current_download = resource
+
+ if download_started == 0:
+ download_started = time.time()
+
+ transfer_size += resource.size
+ file_size = resource.total_size
+
+ menu_mode = "downloading"
# When the download concludes, successfully
# or not, we'll update our menu state and
diff --git a/RNS/Resource.py b/RNS/Resource.py
index 1eeb6289..00a306f6 100644
--- a/RNS/Resource.py
+++ b/RNS/Resource.py
@@ -62,6 +62,7 @@ class Resource:
resource.flags = adv.f
resource.size = adv.t
+ resource.total_size = adv.d
resource.uncompressed_size = adv.d
resource.hash = adv.h
resource.original_hash = adv.o
@@ -122,6 +123,7 @@ class Resource:
resource_data = None
if hasattr(data, "read"):
data_size = os.stat(data.name).st_size
+ self.total_size = data_size
self.grand_total_parts = math.ceil(data_size/Resource.SDU)
if data_size <= Resource.MAX_EFFICIENT_SIZE:
@@ -144,6 +146,7 @@ class Resource:
elif isinstance(data, bytes):
data_size = len(data)
self.grand_total_parts = math.ceil(data_size/Resource.SDU)
+ self.total_size = data_size
resource_data = data
self.total_segments = 1
@@ -467,7 +470,7 @@ class Resource:
RNS.log("Error while cleaning up resource files, the contained exception was:", RNS.LOG_ERROR)
RNS.log(str(e))
else:
- RNS.log("Resource segment "+str(self.segment_index)+" of "+str(self.total_segments)+" received, waiting for next segment to be announced", RNS.LOG_VERBOSE)
+ RNS.log("Resource segment "+str(self.segment_index)+" of "+str(self.total_segments)+" received, waiting for next segment to be announced", RNS.LOG_DEBUG)
def prove(self):
@@ -728,7 +731,7 @@ class Resource:
self.processed_parts = (self.segment_index-1)*math.ceil(Resource.MAX_EFFICIENT_SIZE/Resource.SDU)
self.processed_parts += self.received_count
if self.split:
- self.progress_total_parts = float((self.total_segments-1)*math.ceil(Resource.MAX_EFFICIENT_SIZE/Resource.SDU)+self.total_parts)
+ self.progress_total_parts = float(math.ceil(self.total_size/Resource.SDU))
else:
self.progress_total_parts = float(self.total_parts)
@@ -746,15 +749,15 @@ class ResourceAdvertisement:
def __init__(self, resource=None):
if resource != None:
- self.t = resource.size # Transfer size
- self.d = resource.uncompressed_size # Data size
- self.n = len(resource.parts) # Number of parts
- self.h = resource.hash # Resource hash
- self.r = resource.random_hash # Resource random hash
+ self.t = resource.size # Transfer size
+ self.d = resource.total_size # Total uncompressed data size
+ self.n = len(resource.parts) # Number of parts
+ self.h = resource.hash # Resource hash
+ self.r = resource.random_hash # Resource random hash
self.o = resource.original_hash # First-segment hash
- self.m = resource.hashmap # Resource hashmap
- self.c = resource.compressed # Compression flag
- self.e = resource.encrypted # Encryption flag
+ self.m = resource.hashmap # Resource hashmap
+ self.c = resource.compressed # Compression flag
+ self.e = resource.encrypted # Encryption flag
self.s = resource.split # Split flag
self.i = resource.segment_index # Segment index
self.l = resource.total_segments # Total segments
Served by rngit 1.5.2 - Generated in 0.04s